Fix ChangeLog to reflect merge better.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 10 Jul 2011 04:58:22 +0000 (21:58 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 10 Jul 2011 04:58:22 +0000 (21:58 -0700)
commit9cdb99d89618ebbb722646f22aedc99da177a454
tree88cee19d1fa59fe4b49b4561403f1e4d3e0e7c7c
parent98f7e6e51ca05b1e758a2d6ba2b1ecc953f3e7ad
Fix ChangeLog to reflect merge better.
src/ChangeLog